Revert "gtksnapshot: Merge trivial clip duplicates"
authorAlexander Larsson <alexl@redhat.com>
Fri, 1 Dec 2017 08:08:57 +0000 (09:08 +0100)
committerAlexander Larsson <alexl@redhat.com>
Fri, 1 Dec 2017 08:08:57 +0000 (09:08 +0100)
This reverts commit d95cbb275729370a2dd67e24570ac1c68b62b697.

This is better solved by commit 94184eda4214b3162eead554212443b3a0f50481

gtk/gtksnapshot.c

index a5d4c3968d1e47f3cd094fac08178f52f7e07446..702ea036a6cb7969e1db1fb027a1b14346eb87e1 100644 (file)
@@ -552,21 +552,7 @@ gtk_snapshot_collect_clip (GtkSnapshot      *snapshot,
   if (graphene_rect_contains_rect (&state->data.clip.bounds, &node->bounds))
     return node;
 
-  /* Its not uncommon to produce stacked clip nodes, which are trivial
-     to merge, so do that here */
-  if (gsk_render_node_get_node_type (node) == GSK_CLIP_NODE)
-    {
-      GskRenderNode *child = gsk_clip_node_get_child (node);
-      const graphene_rect_t *node_clip = gsk_clip_node_peek_clip (node);
-      graphene_rect_t merged_clip;
-
-      graphene_rect_intersection (&state->data.clip.bounds, node_clip, &merged_clip);
-      clip_node = gsk_clip_node_new (child, &state->data.clip.bounds);
-      gsk_render_node_unref (node);
-    }
-  else
-    clip_node = gsk_clip_node_new (node, &state->data.clip.bounds);
-
+  clip_node = gsk_clip_node_new (node, &state->data.clip.bounds);
   if (name)
     gsk_render_node_set_name (clip_node, name);